Autogenerated HTML docs for v1.8.2.1-538-gad776
diff --git a/user-manual.html b/user-manual.html index 2283ff6..0d798b7 100644 --- a/user-manual.html +++ b/user-manual.html
@@ -2065,10 +2065,6 @@ branch --set-upstream-to</code> that sets what remote tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state.</p></dd><dt><span class="term"> -<a name="def_dircache"></a>dircache -</span></dt><dd> - You are <span class="strong"><strong>waaaaay</strong></span> behind. See <a class="link" href="#def_index">index</a>. -</dd><dt><span class="term"> <a name="def_directory"></a>directory </span></dt><dd> The list you get with "ls" :-) @@ -2079,12 +2075,6 @@ it contains modifications which have not been <a class="link" href="#def_commit">committed</a> to the current <a class="link" href="#def_branch">branch</a>. </dd><dt><span class="term"> -<a name="def_ent"></a>ent -</span></dt><dd> - Favorite synonym to "<a class="link" href="#def_tree-ish">tree-ish</a>" by some total geeks. See - <a class="ulink" href="http://en.wikipedia.org/wiki/Ent_(Middle-earth" target="_top">http://en.wikipedia.org/wiki/Ent_(Middle-earth</a>) for an in-depth - explanation. Avoid this term, not to confuse people. -</dd><dt><span class="term"> <a name="def_evil_merge"></a>evil merge </span></dt><dd> An evil merge is a <a class="link" href="#def_merge">merge</a> that introduces changes that @@ -2134,7 +2124,7 @@ </dd><dt><span class="term"> <a name="def_hash"></a>hash </span></dt><dd> - In Git’s context, synonym to <a class="link" href="#def_object_name">object name</a>. + In Git’s context, synonym for <a class="link" href="#def_object_name">object name</a>. </dd><dt><span class="term"> <a name="def_head"></a>head </span></dt><dd> @@ -2212,7 +2202,7 @@ <a name="def_object"></a>object </span></dt><dd> The unit of storage in Git. It is uniquely identified by the - <a class="link" href="#def_SHA1">SHA1</a> of its contents. Consequently, an + <a class="link" href="#def_SHA1">SHA-1</a> of its contents. Consequently, an object can not be changed. </dd><dt><span class="term"> <a name="def_object_database"></a>object database @@ -2227,10 +2217,9 @@ </dd><dt><span class="term"> <a name="def_object_name"></a>object name </span></dt><dd> - The unique identifier of an <a class="link" href="#def_object">object</a>. The <a class="link" href="#def_hash">hash</a> - of the object’s contents using the Secure Hash Algorithm - 1 and usually represented by the 40 character hexadecimal encoding of - the <a class="link" href="#def_hash">hash</a> of the object. + The unique identifier of an <a class="link" href="#def_object">object</a>. The + object name is usually represented by a 40 character + hexadecimal string. Also colloquially called <a class="link" href="#def_SHA1">SHA-1</a>. </dd><dt><span class="term"> <a name="def_object_type"></a>object type </span></dt><dd> @@ -2241,8 +2230,7 @@ </dd><dt><span class="term"> <a name="def_octopus"></a>octopus </span></dt><dd> - To <a class="link" href="#def_merge">merge</a> more than two <a class="link" href="#def_branch">branches</a>. Also denotes an - intelligent predator. + To <a class="link" href="#def_merge">merge</a> more than two <a class="link" href="#def_branch">branches</a>. </dd><dt><span class="term"> <a name="def_origin"></a>origin </span></dt><dd> @@ -2266,7 +2254,7 @@ </dd><dt><span class="term"> <a name="def_pathspec"></a>pathspec </span></dt><dd><p class="simpara"> - Pattern used to specify paths. + Pattern used to limit paths in Git commands. </p><p class="simpara">Pathspecs are used on the command line of "git ls-files", "git ls-tree", "git add", "git grep", "git diff", "git checkout", and many other commands to @@ -2279,14 +2267,14 @@ the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree. -</li><li class="listitem"><p class="simpara"> +</li><li class="listitem"> the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, <span class="emphasis"><em>*</em></span> and <span class="emphasis"><em>?</em></span> <span class="emphasis"><em>can</em></span> match directory separators. -</p><p class="simpara">For example, Documentation/*.jpg will match all .jpg files +</li></ul></div><p class="simpara">For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, -including Documentation/chapter_1/figure_1.jpg.</p></li></ul></div><p class="simpara">A pathspec that begins with a colon <code class="literal">:</code> has special meaning. In the +including Documentation/chapter_1/figure_1.jpg.</p><p class="simpara">A pathspec that begins with a colon <code class="literal">:</code> has special meaning. In the short form, the leading colon <code class="literal">:</code> is followed by zero or more "magic signature" letters (which optionally is terminated by another colon <code class="literal">:</code>), and the remainder is the pattern to match against the path. The optional @@ -2296,15 +2284,10 @@ parenthesis <code class="literal">(</code>, a comma-separated list of zero or more "magic words", and a close parentheses <code class="literal">)</code>, and the remainder is the pattern to match against the path.</p><p class="simpara">The "magic signature" consists of an ASCII symbol that is not -alphanumeric.</p><div class="variablelist"><dl><dt><span class="term"> -top <code class="literal">/</code> -</span></dt><dd> - The magic word <code class="literal">top</code> (mnemonic: <code class="literal">/</code>) makes the pattern match - from the root of the working tree, even when you are running - the command from inside a subdirectory. -</dd></dl></div><p class="simpara">Currently only the slash <code class="literal">/</code> is recognized as the "magic signature", -but it is envisioned that we will support more types of magic in later -versions of Git.</p><p class="simpara">A pathspec with only a colon means "there is no pathspec". This form +alphanumeric. Currently only the slash <code class="literal">/</code> is recognized as a +"magic signature": it makes the pattern match from the root of +the working tree, even when you are running the command from +inside a subdirectory.</p><p class="simpara">A pathspec with only a colon means "there is no pathspec". This form should not be combined with other pathspec.</p></dd><dt><span class="term"> <a name="def_parent"></a>parent </span></dt><dd> @@ -2368,7 +2351,7 @@ </dd><dt><span class="term"> <a name="def_ref"></a>ref </span></dt><dd> - A 40-byte hex representation of a <a class="link" href="#def_SHA1">SHA1</a> or a name that + A 40-byte hex representation of a <a class="link" href="#def_SHA1">SHA-1</a> or a name that denotes a particular <a class="link" href="#def_object">object</a>. They may be stored in a file under <code class="literal">$GIT_DIR/refs/</code> directory, or in the <code class="literal">$GIT_DIR/packed-refs</code> file. @@ -2384,15 +2367,7 @@ </span></dt><dd> A "refspec" is used by <a class="link" href="#def_fetch">fetch</a> and <a class="link" href="#def_push">push</a> to describe the mapping between remote - <a class="link" href="#def_ref">ref</a> and local ref. They are combined with a colon in - the format <src>:<dst>, preceded by an optional plus sign, +. - For example: <code class="literal">git fetch $URL - refs/heads/master:refs/heads/origin</code> means "grab the master - <a class="link" href="#def_branch">branch</a> <a class="link" href="#def_head">head</a> from the $URL and store - it as my origin branch head". And <code class="literal">git push - $URL refs/heads/master:refs/heads/to-upstream</code> means "publish my - master branch head as to-upstream branch at $URL". See also - <a class="ulink" href="git-push.html" target="_top">git-push(1)</a>. + <a class="link" href="#def_ref">ref</a> and local ref. </dd><dt><span class="term"> <a name="def_remote_tracking_branch"></a>remote-tracking branch </span></dt><dd> @@ -2432,9 +2407,10 @@ </span></dt><dd> Source code management (tool). </dd><dt><span class="term"> -<a name="def_SHA1"></a>SHA1 +<a name="def_SHA1"></a>SHA-1 </span></dt><dd> - Synonym for <a class="link" href="#def_object_name">object name</a>. + "Secure Hash Algorithm 1"; a cryptographic hash function. + In the context of Git used as a synonym for <a class="link" href="#def_object_name">object name</a>. </dd><dt><span class="term"> <a name="def_shallow_repository"></a>shallow repository </span></dt><dd> @@ -2449,7 +2425,7 @@ </dd><dt><span class="term"> <a name="def_symref"></a>symref </span></dt><dd> - Symbolic reference: instead of containing the <a class="link" href="#def_SHA1">SHA1</a> + Symbolic reference: instead of containing the <a class="link" href="#def_SHA1">SHA-1</a> id itself, it is of the format <span class="emphasis"><em>ref: refs/some/thing</em></span> and when referenced, it recursively dereferences to this reference. <span class="emphasis"><em><a class="link" href="#def_HEAD">HEAD</a></em></span> is a prime example of a symref. Symbolic
